Move definition of pm_power_off to a more sensible location.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c
index 96ee1a68ceafc59094c52e54a33743a568d341a1..5e5d56cce630589765e623fb4e9f29e7854b02ad 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c
@@ -40,8 +40,6 @@
 #include <asm/fixmap.h>
 #endif
 
-void (*pm_power_off)(void) = NULL;
-
 #ifdef CONFIG_X86_64
 
 static inline void  acpi_madt_oem_check(char *oem_id, char *oem_table_id) { }

diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
index 311003e32c5aa34856b20e93d964bb17fb167cd2..644a2c1015b88bd361a34193aca15ba521c53a38 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
@@ -17,6 +17,13 @@
 #include <linux/kthread.h>
 #include <asm-xen/xencons.h>
 
+#if defined(__i386__) || defined(__x86_64__)
+/*
+ * Power off function, if any
+ */
+void (*pm_power_off)(void);
+#endif
+
 #define SHUTDOWN_INVALID  -1
 #define SHUTDOWN_POWEROFF  0
 #define SHUTDOWN_REBOOT    1